From 94e560a0128cdeb2815153ab7da9162f0e504b37 Mon Sep 17 00:00:00 2001
From: Rob Browning <rlb@defaultvalue.org>
Date: Sun, 16 Dec 2018 17:11:00 -0600
Subject: [PATCH] Use more secure mailutils instead of internal movemail

See the 26.1 NEWS for more information.
---
 debian/control                                |  1 +
 ....in => emacs-bin-common.lintian-overrides} |  1 -
 debian/rules                                  | 19 +------------------
 3 files changed, 2 insertions(+), 19 deletions(-)
 rename debian/{emacs-bin-common.lintian-overrides.in => emacs-bin-common.lintian-overrides} (87%)

diff --git a/debian/control b/debian/control
index 6d4a533ea20..c419686ff09 100644
--- a/debian/control
+++ b/debian/control
@@ -119,6 +119,7 @@ Description: Debugging symbols for emacs-gtk
 Package: emacs-bin-common
 Architecture: any
 Depends: emacs-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+ mailutils
 Description: GNU Emacs editor's shared, architecture dependent files
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture dependent infrastructure
diff --git a/debian/emacs-bin-common.lintian-overrides.in b/debian/emacs-bin-common.lintian-overrides
similarity index 87%
rename from debian/emacs-bin-common.lintian-overrides.in
rename to debian/emacs-bin-common.lintian-overrides
index ca908815ad6..fc6ca285907 100644
--- a/debian/emacs-bin-common.lintian-overrides.in
+++ b/debian/emacs-bin-common.lintian-overrides
@@ -1,4 +1,3 @@
-emacs-bin-common binary: setgid-binary @MOVEMAIL_BIN@ 2755 root/mail
 emacs-bin-common binary: binary-without-manpage usr/bin/b2m.emacs
 emacs-bin-common binary: binary-without-manpage usr/bin/ctags.emacs
 emacs-bin-common binary: binary-without-manpage usr/bin/ebrowse.emacs
diff --git a/debian/rules b/debian/rules
index d16e07dd929..8f985b74e04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -112,9 +112,6 @@ ifeq (,$(joblimit))
   joblimit := 1
 endif
 
-target := $(DEB_HOST_GNU_TYPE)
-movemail_bin := usr/lib/emacs/$(runtime_ver)/$(target)/movemail
-
 # Info files that are going to show up in the main dir.
 main_dir_info_files := efaq.info
 
@@ -126,21 +123,17 @@ nonpersistent_autogen_build_files :=
 persistent_autogen_install_files :=
 
 nonpersistent_autogen_install_files := \
-  debian/emacs-bin-common.lintian-overrides \
   debian/emacs-bin-common.postinst \
   debian/emacs-bin-common.prerm \
   debian/emacs-common.README.Debian \
   debian/emacs-common.postinst \
   debian/emacs-common.prerm \
-  debian/emacs-nox.lintian-overrides \
   debian/emacs-nox.postinst \
   debian/emacs-nox.preinst \
   debian/emacs-nox.prerm \
-  debian/emacs-lucid.lintian-overrides \
   debian/emacs-lucid.postinst \
   debian/emacs-lucid.preinst \
   debian/emacs-lucid.prerm \
-  debian/emacs-gtk.lintian-overrides \
   debian/emacs-gtk.preinst \
   debian/emacs-gtk.postinst \
   debian/emacs-gtk.prerm
@@ -204,7 +197,6 @@ define deb_sub
     -e "s|\@MENU_VERSION\@|$(menu_ver)|go;" \
     -e "s|\@X_SUPPORT\@|$(xsupport)|go;" \
     -e "s|\@BIN_PRIORITY\@|$(bin_priority)|go;" \
-    -e "s|\@MOVEMAIL_BIN\@|$(movemail_bin)|go;" \
       < $(1) > $(2)
 endef
 
@@ -220,7 +212,6 @@ check-vars:
 	@echo "runtime_ver: $(runtime_ver)"
 	@echo "major_ver: $(major_ver)"
 	@echo "minor_ver: $(minor_ver)"
-	@echo "movemail_bin: $(movemail_bin)"
 
 .PHONY: check-autogen
 check-autogen: $(persistent_autogen_files) $(nonpersistent_autogen_files)
@@ -280,6 +271,7 @@ confflags += --with-pop=yes
 confflags += --enable-locallisppath=$(local_lpath)
 confflags += --with-sound=alsa
 confflags += --without-gconf
+confflags += --with-mailutils
 
 # x configure flags
 confflags_gtk := $(confflags)
@@ -313,8 +305,6 @@ define build_cmd
   $(MAKE) -C $(1) -j $(joblimit)
   # If we don't use bootstrap, we need to explicitly build info.
   $(MAKE) -C $(1) -j $(joblimit) info
-  # Make sure we chose liblockfile.
-  ldd $(1)/lib-src/movemail | grep liblockfile
 endef
 
 # Don't mess with the source tree (we build in debian/build-*)
@@ -459,10 +449,6 @@ override_dh_auto_install: $(autogen_install_files)
 	  test -f $(pkgdir_bin_common)/usr/bin/emacs-*
 	  rm $(pkgdir_bin_common)/usr/bin/{emacs,emacs-*}
 
-	  # Set up movemail.
-	  chown root.mail $(pkgdir_bin_common)/$(movemail_bin)
-	  chmod g+s $(pkgdir_bin_common)/$(movemail_bin)
-
 	  # Set up alternatives.
 	  alternatives=$$(ls $(pkgdir_bin_common)/usr/bin) \
 	    && set -x \
@@ -574,9 +560,6 @@ override_dh_strip_nondeterminism:
 override_dh_testdir:
 	dh_testdir debian/emacsVAR.postinst
 
-override_dh_fixperms:
-	dh_fixperms -X$(movemail_bin)
-
 override_dh_auto_clean: $(persistent_autogen_files)
 	true
 
-- 
2.30.2